* net/rcirc.el (rcirc-keepalive): Fix invalid timer error.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 58e74a3951c2db94dfb3ccda4a20fe8fa9787e71..d51e13321e1bc5344f9595725dd78a2d9b4e9de7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-17  Leo Liu  <sdl.web@gmail.com>
+
+       * net/rcirc.el (rcirc-keepalive): Fix invalid timer error.
+
 2013-02-17  Glenn Morris  <rgm@gnu.org>
 
        * menu-bar.el (menu-bar-tools-menu): Fix case of EDE entry.

diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 086043c2b4aeb142ec5c54cd3becc28a4b23be01..7c70ded3eaa165f5f5fe3ea1209f46f0ce5ff49f 100644 (file)
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -625,7 +625,8 @@ last ping."
                                            (rcirc-float-time))))))
             (rcirc-process-list))
     ;; no processes, clean up timer
-    (cancel-timer rcirc-keepalive-timer)
+    (when (timerp rcirc-keepalive-timer)
+      (cancel-timer rcirc-keepalive-timer))
     (setq rcirc-keepalive-timer nil)))
 
 (defun rcirc-handler-ctcp-KEEPALIVE (process target sender message)